]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
[workspaces] Don't crash trying to get an icon for untracked app
authorColin Walters <walters@verbum.org>
Thu, 15 Oct 2009 20:17:18 +0000 (16:17 -0400)
committerColin Walters <walters@verbum.org>
Thu, 15 Oct 2009 21:31:57 +0000 (17:31 -0400)
Use ShellApp directly rather than trying to handle null-safety
with .get_info().

js/ui/workspaces.js

index 217adcf6ecd974997d0e526ddfc772c408d3ea79..3be0ab39b5acf8bb7d3c0cc9c2bf010bbd57430d 100644 (file)
@@ -1227,13 +1227,13 @@ Workspace.prototype = {
     _createWindowIcon: function(window) {
         let appSys = Shell.AppSystem.get_default();
         let appMon = Shell.AppMonitor.get_default()
-        let appInfo = appMon.get_window_app(window.metaWindow).get_info();
+        let app = appMon.get_window_app(window.metaWindow);
         let iconTexture = null;
         // The design is application based, so prefer the application
         // icon here if we have it.  FIXME - should move this fallback code
         // into ShellAppMonitor.
-        if (appInfo) {
-            iconTexture = appInfo.create_icon_texture(48);
+        if (app) {
+            iconTexture = app.create_icon_texture(48);
         } else {
             let icon = window.metaWindow.icon;
             iconTexture = new Clutter.Texture({ width: 48,